Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Reserved peers, reserved-only flag #1347

Merged
merged 5 commits into from
Jun 20, 2016
Merged

Conversation

rphmeier
Copy link
Contributor

No RPC API just yet, that will come in a follow-up.

@rphmeier rphmeier added the A0-pleasereview 🤓 Pull request needs code review. label Jun 20, 2016
@@ -236,6 +240,8 @@ pub struct Args {
pub flag_no_discovery: bool,
pub flag_nat: String,
pub flag_node_key: Option<String>,
pub flag_reserved_peers: Option<String>,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation?

[ci skip]
@arkpar arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jun 20, 2016
@rphmeier
Copy link
Contributor Author

the indentation commit was [ci skip]. The other commits still have a travis build pending. don't merge until it is finished

@rphmeier rphmeier mentioned this pull request Jun 20, 2016
@debris debris merged commit a671346 into openethereum:master Jun 20, 2016
@rphmeier
Copy link
Contributor Author

This needs reverting -- the travis build never finished

@debris
Copy link
Collaborator

debris commented Jun 20, 2016

ahh.. haven't noticed that. sry

@rphmeier
Copy link
Contributor Author

superseded by #1350

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants